Merge "Add sdk destinations for appcompat.sh related files." am: c8c4f29308
am: 7ade6f923f

Change-Id: I97a53442fde80d9077a5ab48366af551ce9ff026