am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev

* commit '4df0782b3adfd03c167111790fdf5a9de676080c':
  Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.