Merge 4392352f2d649266057459dca6a3944a750f7aee on remote branch

Change-Id: I5a7f6c27b75162ccb5b970b8b96f26917be05851
tree: a82ad157025e9becc88c1d7560fdee26f5ce8478
  1. Android.bp
  2. Android.mk
  3. time_genoff.h