Merge \\"Update package whitelist to track changes to java.lang.invoke.\\" am: 8ce8f60a2f
am: dbce967b11

Change-Id: I4133d0b40f5a324f8ba0f94537f13e259e839808