Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374 am: c6ebc088d5
am: 9f02eec6dd

Change-Id: Ica423b2f555491560a66c4958f8cdd200d3fefbb