Merge "Fix include order of libandroid_support." am: 0e4bd14fba am: 223d393ce5 am: 7651bf4758

Change-Id: I38887e0242d3831161a24a4c93e13bcf66a3d138