Fix Android amalgamated build.
Merge branch 'amalgamated'. Fix Android amalgamated build.