Android 4.3 release 3.0
am cd7a9917: Merge "Fix build with GCC 4.7"

* commit 'cd7a9917db9ad4a4f56cca5153ea2a7b8fecfde9':
  Fix build with GCC 4.7