Merge "Update SDK annotations database prebuilt" am: f024d596a2
am: 151eadac8d

Change-Id: I7f8deba9c75e64ec7f917a9d75b6d513c87fde11