Merge changes I4ebccfd0,I3507bdfd,Iaf02f55c am: acca0abaf1
am: f6ec7d5e3a

* commit 'f6ec7d5e3a55ee7eca4203dc386b6d0837b8e660':
  Parcel: file descriptor leak
  Parcel: include Android coding standard
  Parcel: LOG_TAG cleanup