Merge "Regenerate material Android.mk using fixed pom2mk" into pi-dev
am: a253d1916f

Change-Id: I7ddd86fd67204f8e77e2aaeed0edcb8c0b891f05