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

Change-Id: I455b02bd526fb3fa8f9abbd2f3ba3644dd87ab6c