am 8128f7fa: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit '8128f7facef4648320b7ea4f93f27014ea153ac9':
  Backport from HC to Fix NetworkInfoTest
  Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.
  Farewell Magnetometer Test
tree: 8dc8d433bb4f9062a6099e79bd87532a0fa446bb
  1. tests/