Merge "Mark libexpat as double_loadable" am: 256f181842 am: 9f5ff2911d
am: c6da03257c

Change-Id: I270a90e19c32de14333d5bf7b1565cb045e19d0d