Merge "O is API 26" into oc-dev

am: 7cc3f0a9

Change-Id: Ie5fbe081e35116ee4751b43f323b83ac56993870

Android.mk

@@ -10,7 +10,7 @@ LOCAL_PATH:= $(call my-dir)
 # is made which breaks compatibility with the previous platform sepolicy version,
 # not just on every increase in PLATFORM_SDK_VERSION.  The minor version should
 # be reset to 0 on every bump of the PLATFORM_SDK_VERSION.
-sepolicy_major_vers := 25
+sepolicy_major_vers := 26
 sepolicy_minor_vers := 0
 
 ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))