Now that the Android clang has been upgraded to clang-r563880 (llvm.org/pr148998), these two tests pass again.