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

Change-Id: I7179505cf441c139917798988c468f4022d144bd