Merge "Fix reference to header file in art." am: 16416f0e10 am: 8431eb6c13
am: 3c0225cc0c

Change-Id: I8a5212e9442fa8b6c5569aa9f7d1cc3c6944bef9