Merge "Convert platformprotosnano and platformprotoslite to Android.bp" am: c465fef277 am: 2f9f6b009d
am: e3eb78dd92

Change-Id: I4f0ea8c51aa0dfadcbd93fa9e553aba536594cf3