Merge "Remove ld.config.txt from sdkext APEX" am: e5301db423 am: c4c8161fc7

Change-Id: I54d7213a83c733e5c7f3af7db8a6d7d472c400cd