Merge "Switch from java_libs to java_header_libs for sdkext-sdk" am: e84e60ae79 am: 582b734db9 am: 6a9108de56

Change-Id: I9e90ad43611ff00b4fa6041e4a0d32f3e98a768a