Merge "Add Android.mk"
am: 6a6ebf0b8d

Change-Id: I7e223f15cd62ee6095f343d01ee046584746f514