am 59582607: Fix a build breakage.

Merge commit '59582607bc341f9e9662d6ec5c1a93bb4c537d38'

* commit '59582607bc341f9e9662d6ec5c1a93bb4c537d38':
  Fix a build breakage.
tree: 9b12bdf8552f94f012b45692f090296182af876a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml