Merge "Add system property to force hw acceleration."