Merge "Added auto-parcel and android-apt."